Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Sat, 8 Aug 2020 19:13:44 +0000 (19:13 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 8 Aug 2020 19:13:44 +0000 (19:13 +0000)
Matthiasc/for master

Closes #3037 and #3030

See merge request GNOME/gtk!2417


Trivial merge